From 3b01829e42fd9f10c13395c51610d2bf862ee979 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 27 Mar 2008 15:13:55 +0000 Subject: [PATCH] libfsimage: Revert broken parts of portability changes to the build system. Signed-off-by: Keir Fraser --- tools/libfsimage/Makefile | 2 +- tools/libfsimage/check-libext2fs | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/libfsimage/Makefile b/tools/libfsimage/Makefile index b72e51895a..7dd3c4f0fb 100644 --- a/tools/libfsimage/Makefile +++ b/tools/libfsimage/Makefile @@ -2,7 +2,7 @@ XEN_ROOT = ../.. include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y = common ufs reiserfs iso9660 fat -SUBDIRS-y += $(shell $(SHELL) env CC="$(CC)" ./check-libext2fs) +SUBDIRS-y += $(shell env CC="$(CC)" ./check-libext2fs) .PHONY: all clean install all clean install: %: subdirs-% diff --git a/tools/libfsimage/check-libext2fs b/tools/libfsimage/check-libext2fs index b6fa7fbacd..3c79fb0553 100755 --- a/tools/libfsimage/check-libext2fs +++ b/tools/libfsimage/check-libext2fs @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash cat >ext2-test.c < @@ -9,9 +9,7 @@ int main() } EOF -if test -z ${CC}; then CC="gcc"; fi -${CC} -o ext2-test ext2-test.c -lext2fs >/dev/null 2>&1 - +${CC-gcc} -o ext2-test ext2-test.c -lext2fs >/dev/null 2>&1 if [ $? = 0 ]; then echo ext2fs-lib else -- 2.30.2